deprecate the entire gdk-pixbuf-marshal.h since it's installed by accident

2008-05-02  Michael Natterer  <mitch@imendio.com>

	* Makefile.am (stamp-gdk-pixbuf-marshal.h): deprecate the entire
	gdk-pixbuf-marshal.h since it's installed by accident only and
	shouldn't be used by anybody.

svn path=/trunk/; revision=20067

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 250df528ccff231862cc9c3d836957fb0279c7cf..ddbda97e01e6ccbde31638ca82739024813a49db 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-02  Michael Natterer  <mitch@imendio.com>
+
+       * Makefile.am (stamp-gdk-pixbuf-marshal.h): deprecate the entire
+       gdk-pixbuf-marshal.h since it's installed by accident only and
+       shouldn't be used by anybody.
+
 2008-03-21  Tor Lillqvist  <tml@novell.com>
 
        Import the GDI+ gdk-pixbuf loaders for Windows by Dominic

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index d90aa43ca7617e60407cc50e2b76012ac43970a3..7421617f9cc7f3eaf18efd59c4ec4be538db03ee 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -624,7 +624,9 @@ gdk-pixbuf-marshal.h: @REBUILD@ stamp-gdk-pixbuf-marshal.h
        @true
 
 stamp-gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
-       $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --header >> xgen-gmh \
+       echo "#ifndef GDK_PIXBUF_DISABLE_DEPRECATED" > xgen-gmh \
+       && $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --header >> xgen-gmh \
+       && echo "#endif /* GDK_PIXBUF_DISABLE_DEPRECATED */" >> xgen-gmh \
        && (cmp -s xgen-gmh gdk-pixbuf-marshal.h || cp xgen-gmh gdk-pixbuf-marshal.h) \
        && rm -f xgen-gmh xgen-gmh~ \
        && echo timestamp > $(@F)